From: Florian Eckert <fe@dev.tdt.de>
Date: Thu, 27 Apr 2017 07:22:27 +0000 (+0200)
Subject: net/mwan3: add connected network regardless of mwan3 interface enable state
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22http:/www.crowdsec.net/%22/%22https:/collectd.org/%22http:/www.crowdsec.net/%22?a=commitdiff_plain;h=70d96f5dcc203088a16b884c3ccf00b0bf5b492e;p=feed%2Fpackages.git

net/mwan3: add connected network regardless of mwan3 interface enable state

If netifd set an interface up/down which is not tracked by mwan3 the
connected network of that interface should regardless be added/removed to the
mwan3_connected ipset.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit f94975b71fc80912dd84feb845c2d86aeb82e7b1)
---

diff --git a/net/mwan3/files/etc/hotplug.d/iface/15-mwan3 b/net/mwan3/files/etc/hotplug.d/iface/15-mwan3
index 045a481c87..51bba594f2 100644
--- a/net/mwan3/files/etc/hotplug.d/iface/15-mwan3
+++ b/net/mwan3/files/etc/hotplug.d/iface/15-mwan3
@@ -4,11 +4,6 @@
 . /lib/functions/network.sh
 . /lib/mwan3/mwan3.sh
 
-config_load mwan3
-
-config_get enabled $INTERFACE enabled 0
-[ "$enabled" == "1" ] || exit 0
-
 [ "$ACTION" == "ifup" -o "$ACTION" == "ifdown" ] || exit 1
 [ -n "$INTERFACE" ] || exit 2
 
@@ -22,6 +17,12 @@ fi
 [ -x /usr/sbin/ip6tables ] || exit 7
 [ -x /usr/bin/logger ] || exit 8
 
+mwan3_set_connected_iptables
+
+config_load mwan3
+config_get enabled $INTERFACE enabled 0
+[ "$enabled" == "1" ] || exit 0
+
 config_get family $INTERFACE family ipv4
 
 if [ "$family" == "ipv4" ]; then
@@ -36,8 +37,6 @@ fi
 
 $LOG notice "$ACTION interface $INTERFACE (${DEVICE:-unknown})"
 
-mwan3_set_connected_iptables
-
 case "$ACTION" in
 	ifup)
 		mwan3_set_general_rules